Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[system][cherryusb] add new port for cherryusb pusb2 #1705

Merged
merged 5 commits into from
Nov 18, 2023
Merged

[system][cherryusb] add new port for cherryusb pusb2 #1705

merged 5 commits into from
Nov 18, 2023

Conversation

zhugengyu
Copy link
Contributor

  • add new item for cherryusb port

图片

图片

@sakumisu
Copy link
Contributor

已经review，可以合并

@supperthomas
Copy link
Member

@vacabun CI 哪里报错？

@vacabun
Copy link
Contributor

vacabun commented Nov 15, 2023

https://github.com/Ezviz-OpenBiz/ez_iot_os.git is invalid.

@vacabun
Copy link
Contributor

vacabun commented Nov 15, 2023

跟这个没关系

https://github.com/RT-Thread/packages/blob/master/iot/iot_cloud/ez_iot_os/package.json

这个软件包没了

@supperthomas
Copy link
Member

@ezvizlife

@zhugengyu
Copy link
Contributor Author

@ezvizlife

ci 问题不是新引入的话是不是可以帮忙合入了，谢谢

@zhugengyu
Copy link
Contributor Author

zhugengyu commented Nov 16, 2023 •
edited
Loading

修改了之后还是有问题 @supperthomas

图片

@vacabun
Copy link
Contributor

vacabun commented Nov 16, 2023

ci工具检查的是package.json，还在的话还是会出错

@vacabun
Copy link
Contributor

vacabun commented Nov 16, 2023

要删的话是不是要把整个ez_iot_os文件夹都删了？

@zhugengyu
Copy link
Contributor Author

要删的话是不是要把整个ez_iot_os文件夹都删了？

好的

@vacabun
Copy link
Contributor

vacabun commented Nov 16, 2023

还是把kconfig和json都不要删，kconfig用#注释，json文件后缀额外加一个.missing

@vacabun
Copy link
Contributor

vacabun commented Nov 16, 2023

5f749b0
恢复到这里kconfig注释 然后package.json重命名为package.json.missing

@zhugengyu
Copy link
Contributor Author

5f749b0 恢复到这里kconfig注释 然后package.json重命名为package.json.missing

要不你们帮忙修改下 push 到我的分支吧，我已经把刚刚的修改回退了

@zhugengyu
Copy link
Contributor Author

@supperthomas 好像还有其他错误

图片

@supperthomas
Copy link
Member

@vacabun

@zhugengyu
Copy link
Contributor Author

zhugengyu commented Nov 16, 2023 •
edited
Loading

@vacabun

  • 本地试了，新加内容可以使用

图片

  • 好像是 155 号 CI 没过，不清楚原因
No.154
latest : https://github.com/mysterywolf/Ppool.git
VER_SHA: master

No.155
latest : https://github.com/hyafz/plccore.git
VER_SHA: master
The JSON config file syntax checking failed!

@vacabun
Copy link
Contributor

vacabun commented Nov 16, 2023 •
edited
Loading

不是kconfig的问题

package.json 新加的版本和上一个版本之间少一个逗号😂

image

@zhugengyu
Copy link
Contributor Author

不是kconfig的问题

package.json 新加的版本和上一个版本之间少一个逗号😂
image

已经加上了

@supperthomas
Copy link
Member

@mysterywolf @Guozhanxin

@mysterywolf mysterywolf merged commit bb7c82e into RT-Thread:master Nov 18, 2023
11 checks passed
@mysterywolf
Copy link
Member

感谢提交PR！

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@supperthomas supperthomas supperthomas approved these changes

@mysterywolf mysterywolf mysterywolf approved these changes

Assignees
No one assigned
Labels
+1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zhugengyu @sakumisu @supperthomas @vacabun @mysterywolf